genirq: Restore trigger settings in irq_modify_status()
authorMarc Zyngier <marc.zyngier@arm.com>
Fri, 18 Aug 2017 09:53:45 +0000 (10:53 +0100)
committerpopcornmix <popcornmix@gmail.com>
Fri, 25 Aug 2017 16:35:09 +0000 (17:35 +0100)
commitb17b7101e21060501683ae1ac6689f8c328670ce
tree70737d957941554a5af564bbb3b68856dd8778f2
parentef3078ac1621817a8bc219f3794ec34adf381167
genirq: Restore trigger settings in irq_modify_status()

commit e8f241893dfbbebe2813c01eac54f263e6a5e59c upstream.

irq_modify_status starts by clearing the trigger settings from
irq_data before applying the new settings, but doesn't restore them,
leaving them to IRQ_TYPE_NONE.

That's pretty confusing to the potential request_irq() that could
follow. Instead, snapshot the settings before clearing them, and restore
them if the irq_modify_status() invocation was not changing the trigger.

Fixes: 1e2a7d78499e ("irqdomain: Don't set type when mapping an IRQ")
Reported-and-tested-by: jeffy <jeffy.chen@rock-chips.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jon Hunter <jonathanh@nvidia.com>
Link: http://lkml.kernel.org/r/20170818095345.12378-1-marc.zyngier@arm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/irq/chip.c